fix(gke): resolve version aliases on UpdateCluster desired versions by avison9 · Pull Request #198 · floci-io/floci-gcp

avison9 · 2026-09-13T04:08:40Z

Summary

UpdateCluster stored desiredMasterVersion and desiredNodeVersion verbatim. Both fields document the same aliases as UpdateMasterRequest.master_version (latest, -, 1.X, 1.X.Y), and gcloud relies on them: gcloud container clusters upgrade C --master and ... --node-pool P both call UpdateCluster, and when no --cluster-version is given gcloud sends the literal - (api_adapter.py, UpdateClusterCommon). Against the emulator the cluster then reported currentMasterVersion: "-". Closes #196.

This is the gap noted in #192, where UpdateMaster gained alias resolution and UpdateCluster was deliberately left for its own PR.

# BEFORE
H=http://localhost:4588/container/v1/projects/p/locations/us-central1
curl -s -X POST "$H/clusters" -H 'Content-Type: application/json' -d '{"cluster":{"name":"c"}}'
curl -s -X PUT "$H/clusters/c" -H 'Content-Type: application/json' -d '{"update":{"desiredMasterVersion":"-"}}'
curl -s "$H/clusters/c" | jq .currentMasterVersion
# "-"

# AFTER
curl -s "$H/clusters/c" | jq .currentMasterVersion
# "1.30.5-gke.1014001"

What changed

desiredMasterVersion goes through the existing resolveMasterVersion, so it behaves exactly like UpdateMaster.
desiredNodeVersion goes through a new one-line resolveNodeVersion: identical rules, except - picks the cluster's current master version rather than the server default, which is the one documented difference between the two fields (cluster_service.proto L3542: "picks the Kubernetes master version"). The resolved value is applied to both the cluster aggregate and each targeted pool.
Block order in updateCluster is unchanged: the node block still resolves its targets before mutating anything, so a rejected desiredNodePoolId leaves no partial state. The proto allows one ClusterUpdate field per request, so a node - reads the stored master version, not one the same request might also be changing.
docs/services/gke.md updated.

Independent of #195 (different lines of the same file); either can merge first.

Type of change

Bug fix (fix:)
New feature (feat:)
Breaking change (feat!: or fix!:)
Docs / chore

GCP Compatibility

Alias semantics from ClusterUpdate.desired_master_version (L3706-L3716) and desired_node_version (L3532-L3543) in cluster_service.proto @ aa87617d67. Request shapes in the REST test are the ones gcloud sends for container clusters upgrade with and without --master.

Tests

GkeServiceTest.updateClusterResolvesDesiredMasterVersionAliases (new): - and latest resolve to the advertised version; explicit stays verbatim; node version does not move.
GkeServiceTest.updateClusterResolvesDesiredNodeVersionAliasesAgainstTheMaster (new): on a cluster whose master is not the advertised version, node latest resolves to the advertised version and node - resolves to the cluster's master, on both the aggregate and the pool.
GkeUpdateClusterRestIntegrationTest (new): the two gcloud request bodies over PUT, asserting the read-back is a real version and never -.
All three were written first and failed with but was: <-> / but was: <latest>.

Full suite: baseline on main @ c534f6b is 1043 run / 0 failures / 0 errors / 0 skipped; with this change 1046 / 0 / 0 / 0 (the 3 new tests, nothing else changed).

Checklist

./mvnw test passes locally
New or updated integration test added
Commit messages follow Conventional Commits

🤖 Generated with Claude Code

https://claude.ai/code/session_01VTYz9WSVDx9vDqBoy4K96j

desiredMasterVersion and desiredNodeVersion were stored verbatim, so gcloud `container clusters upgrade` with no --cluster-version, which sends the literal "-", left the cluster reporting version "-". Route desiredMasterVersion through the resolver UpdateMaster already uses and resolve desiredNodeVersion the same way, except that "-" on the node side picks the cluster's current master version, as the proto documents. Closes floci-io#196

greptile-apps · 2026-09-13T04:11:12Z

Greptile Summary

This PR fixes GKE UpdateCluster version alias handling so stored cluster and node-pool versions remain concrete.

Resolves master aliases through the existing master-version resolver.
Resolves node - against the cluster’s current master version and updates targeted pools consistently.
Adds service-level and REST integration coverage for master and node upgrades.
Documents the alias semantics used by gcloud upgrade requests.

Confidence Score: 5/5

The PR appears safe to merge, with the alias behavior consistently applied and covered through service and REST tests.

No actionable failures remain: alias resolution uses the advertised server version, node - reads a guaranteed current master version, target validation precedes mutation, and cluster and pool readbacks stay consistent.

Important Files Changed

Filename	Overview
src/main/java/io/floci/gcp/services/gke/GkeService.java	Resolves UpdateCluster master and node aliases before updating cluster and node-pool state.
src/test/java/io/floci/gcp/services/gke/GkeServiceTest.java	Adds focused coverage for master aliases, node aliases, explicit versions, and independent control-plane and node versions.
src/test/java/io/floci/gcp/services/gke/GkeUpdateClusterRestIntegrationTest.java	Verifies the gcloud-style REST request bodies produce concrete master and node versions.
docs/services/gke.md	Documents UpdateCluster alias behavior and the node-side meaning of `-`.

Flowchart

%%{init: {'theme': 'neutral'}}%%
flowchart TD
    A[UpdateCluster request] --> B{Version field}
    B -->|desiredMasterVersion| C[resolveMasterVersion]
    C --> D[Update currentMasterVersion]
    B -->|desiredNodeVersion| E{Requested value is dash?}
    E -->|Yes| F[Use current master version]
    E -->|No| G[resolveMasterVersion]
    F --> H[Update cluster node version]
    G --> H
    H --> I[Update targeted node pools]

_{Reviews (1): Last reviewed commit: "fix(gke): resolve version aliases on Upd..." | Re-trigger Greptile}

hectorvent · 2026-09-13T23:21:31Z

Thank you, and particularly for checking the one-field-per-request rule rather than assuming it, since the whole design rests on it. I confirmed all three: desired_node_version documents "-" as "picks the Kubernetes master version" where desired_master_version says "picks the default Kubernetes version", and ClusterUpdate does say "at most one field can be provided" (cluster_service.proto). Tests run 49/0 here.

(follow-up, separate PR) Once fix(gke): reject master version spellings the field does not document #197 lands too, a bad node version reports the master field: I merged both branches locally and desiredNodeVersion: "banana" gives 400 Invalid master version "banana": expected .... The status is right, just the field name in the text. Would you be open to passing the field name into the helper, in whichever of the two lands second?

No blockers from my side.

hectorvent

All three contract claims confirmed verbatim, including the one-field-per-request rule the design rests on; tests 49/0 locally.

avison9 · 2026-09-14T06:04:31Z

Happy to. Both landed, so it is its own PR: #199 passes the field name into the resolver, and desiredNodeVersion: "banana" now returns Invalid desiredNodeVersion "banana": expected .... Covered by a test over all three fields that failed first with the old message.

hectorvent · 2026-09-15T04:55:36Z

🎉 This PR is included in version 0.9.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

# [0.9.0](floci-io/floci-gcp@0.8.0...0.9.0) (2026-09-15) ### Bug Fixes * **firebaseauth:** match Number() coercion for session cookie validDuration ([floci-io#154](floci-io#154)) ([c71702c](floci-io@c71702c)), closes [Number#longValue](https://github.com/Number/issues/longValue) * **firebaseauth:** send CORS headers on Identity Toolkit client endpoints ([floci-io#153](floci-io#153)) ([8855603](floci-io@8855603)) * **firebaseauth:** send CORS headers on the emulator endpoints and always vary on Origin ([floci-io#186](floci-io#186)) ([ca81461](floci-io@ca81461)) * **gcs:** batch requests fail when the published port differs from the internal one ([floci-io#167](floci-io#167)) ([d810602](floci-io@d810602)) * **gcs:** evict abandoned resumable and streaming upload sessions ([floci-io#176](floci-io#176)) ([6033f0c](floci-io@6033f0c)), closes [floci-io#136](floci-io#136) [floci-io#150](floci-io#150) * **gcs:** map cacheControl and customTime on the gRPC object path ([floci-io#184](floci-io#184)) ([e94d179](floci-io@e94d179)) * **gcs:** populate Bucket.bucket_id on gRPC bucket responses ([floci-io#155](floci-io#155)) ([5611bff](floci-io@5611bff)), closes [floci-io#148](floci-io#148) * **gcs:** preserve prefixes when listing with matchGlob ([floci-io#188](floci-io#188)) ([4846129](floci-io@4846129)) * **gcs:** reject deletion of non-empty buckets ([floci-io#180](floci-io#180)) ([0ec3a3e](floci-io@0ec3a3e)), closes [floci-io#178](floci-io#178) * **gcs:** resolve the request base URL from the authority, not the Host header ([floci-io#168](floci-io#168)) ([285d04d](floci-io@285d04d)) * **gke:** reject master version spellings the field does not document ([floci-io#197](floci-io#197)) ([7939306](floci-io@7939306)), closes [floci-io#195](floci-io#195) * **gke:** resolve version aliases on UpdateCluster desired versions ([floci-io#198](floci-io#198)) ([1bd6583](floci-io@1bd6583)), closes [floci-io#196](floci-io#196) ### Features * **gcs:** accept system metadata at upload time and allow zero-byte objects ([floci-io#170](floci-io#170)) ([8c480a2](floci-io@8c480a2)) * **gcs:** add chunked rewrite, HMAC keys, and soft delete with restore ([floci-io#175](floci-io#175)) ([048333e](floci-io@048333e)) * **gcs:** add endOffset, matchGlob and includeTrailingDelimiter to objects.list ([floci-io#169](floci-io#169)) ([4891e75](floci-io@4891e75)) * **gcs:** add projects.serviceAccount and the GCS testIamPermissions spelling ([floci-io#171](floci-io#171)) ([6e524bf](floci-io@6e524bf)), closes [Storage#getServiceAccount](https://github.com/Storage/issues/getServiceAccount) [storage#testIamPermissionsResponse](https://github.com/storage/issues/testIamPermissionsResponse) * **gcs:** honour conditional read preconditions on objects.get ([floci-io#172](floci-io#172)) ([707cc4f](floci-io@707cc4f)) * **gcs:** serve decompressive transcoding and add XML list and delete ([floci-io#173](floci-io#173)) ([649e9fc](floci-io@649e9fc)) * **gcs:** validate bucket names and tighten bucket and compose error shapes ([floci-io#174](floci-io#174)) ([0310ea2](floci-io@0310ea2)) * **gke:** implement ClusterManager.UpdateMaster ([floci-io#192](floci-io#192)) ([c534f6b](floci-io@c534f6b)), closes [floci-io#177](floci-io#177) * **gke:** model node pools as real resources and complete the ClusterManager surface ([floci-io#96](floci-io#96)) ([20c1fd9](floci-io@20c1fd9)), closes [floci-io#95](floci-io#95) ### Performance Improvements * **docker:** move the runtime images to ubi9-micro and drop gosu ([floci-io#185](floci-io#185)) ([c9c2f97](floci-io@c9c2f97)), closes [#3037](https://github.com/floci-io/floci-gcp/issues/3037) [#3085](https://github.com/floci-io/floci-gcp/issues/3085) [#3108](https://github.com/floci-io/floci-gcp/issues/3108)

hectorvent added bug Something isn't working gke Google Kubernetes Engine (GKE) labels Sep 13, 2026

hectorvent approved these changes Sep 13, 2026

View reviewed changes

hectorvent merged commit 1bd6583 into floci-io:main Sep 13, 2026
12 checks passed

avison9 mentioned this pull request Sep 14, 2026

fix(gke): name the request field in invalid version errors #199

Open

7 tasks

hectorvent added the released label Sep 15, 2026

Navigation Menu

Uh oh!

Uh oh!

fix(gke): resolve version aliases on UpdateCluster desired versions - #198

fix(gke): resolve version aliases on UpdateCluster desired versions#198
hectorvent merged 1 commit into
floci-io:mainfrom
avison9:fix/196-update-cluster-version-aliases

avison9 commented Sep 13, 2026

Uh oh!

greptile-apps Bot commented Sep 13, 2026

Greptile Summary

Confidence Score: 5/5

Important Files Changed

Flowchart

Uh oh!

hectorvent commented Sep 13, 2026

Uh oh!

hectorvent left a comment

Uh oh!

Uh oh!

avison9 commented Sep 14, 2026

Uh oh!

hectorvent commented Sep 15, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Uh oh!

Conversation

avison9 commented Sep 13, 2026

Summary

What changed

Type of change

GCP Compatibility

Tests

Checklist

Uh oh!

greptile-apps Bot commented Sep 13, 2026

Greptile Summary

Confidence Score: 5/5

Important Files Changed

Flowchart

Uh oh!

hectorvent commented Sep 13, 2026

Uh oh!

hectorvent left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

avison9 commented Sep 14, 2026

Uh oh!

hectorvent commented Sep 15, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants